From dc7fc11ba5bd3dfdcc247afd8cff5b13b404297f Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Thu, 25 Nov 2004 18:09:59 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.455 (41a61ff7up8G8qJyPAoWdgwg6BfRog) sync w/ head. --- xen/arch/x86/memory.c | 2 +- xen/common/dom_mem_ops.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index 4147a2c373..fc57e0bf1c 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -1317,7 +1317,7 @@ int do_mmu_update( (void)get_user(done, pdone); } - if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) ) + if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) ) { UNLOCK_BIGLOCK(d); return -EFAULT; } diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index 0d34fd58c0..cb1734e998 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -22,14 +22,14 @@ */ #define START_EXTENT_SHIFT 4 /* op[:4] == start_extent */ -#define PREEMPT_CHECK(_op) \ - if ( hypercall_preempt_check() ) { \ - hypercall_create_continuation( \ - __HYPERVISOR_dom_mem_op, 5, \ - (_op) | (i << START_EXTENT_SHIFT), \ - extent_list, nr_extents, extent_order, \ - (d == current) ? DOMID_SELF : d->id); \ - return __HYPERVISOR_dom_mem_op; \ +#define PREEMPT_CHECK(_op) \ + if ( hypercall_preempt_check() ) { \ + hypercall_create_continuation( \ + __HYPERVISOR_dom_mem_op, 5, \ + (_op) | (i << START_EXTENT_SHIFT), \ + extent_list, nr_extents, extent_order, \ + (d == current->domain) ? DOMID_SELF : d->id); \ + return __HYPERVISOR_dom_mem_op; \ } static long -- 2.30.2